Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 3 Feb 2010 12:21:41 +0000 (12:21 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 3 Feb 2010 12:21:41 +0000 (12:21 +0000)

Trivial merge